From 57171ad7e67a746510fe32e677734896835e6153 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sat, 29 Nov 2014 18:21:12 +0100
Subject: [PATCH] Adwaita: set scale with marks trough margin where it belongs
 to

---
 gtk/resources/theme/Adwaita/_common.scss      | 16 ++++++-------
 .../theme/Adwaita/gtk-contained-dark.css      | 24 +++++++++----------
 gtk/resources/theme/Adwaita/gtk-contained.css | 24 +++++++++----------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 4c755e3765..e359644cba 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -2375,20 +2375,20 @@ $asset_suffix: if($variant=='dark', '-dark', '');
 }
 
 %scale_marks_above_horz {
-  margin: 14px 10px 10px;
-  &.fine-tune { margin: 12px 8px 8px; }
+  .trough { margin: 14px 10px 10px; }
+  &.fine-tune .trough { margin: 12px 8px 8px; }
 }
 %scale_marks_below_horz {
-  margin: 10px 10px 14px;
-  &.fine-tune { margin: 8px 8px 12px; }
+ .trough { margin: 10px 10px 14px; }
+  &.fine-tune .trough { margin: 8px 8px 12px; }
 }
 %scale_marks_above_vert {
-  margin: 10px 10px 10px 14px;
-  &.fine-tune { margin: 8px 8px 8px 12px; }
+  .trough { margin: 10px 10px 10px 14px; }
+  &.fine-tune .trough { margin: 8px 8px 8px 12px; }
 }
 %scale_marks_below_vert {
-  margin: 10px 14px 10px 10px;
-  &.fine-tune { margin: 8px 12px 8px 8px; }
+  .trough { margin: 10px 14px 10px 10px; }
+  &.fine-tune .trough { margin: 8px 12px 8px 8px; }
 }
 
 /*****************
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 7d6eb03673..33e761c3d6 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -3372,25 +3372,25 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.scale-has-marks-above {
+.scale.scale-has-marks-above .trough {
   margin: 14px 10px 10px; }
-  .fine-tune.scale.scale-has-marks-above {
-    margin: 12px 8px 8px; }
+.fine-tune.scale.scale-has-marks-above .trough {
+  margin: 12px 8px 8px; }
 
-.scale.scale-has-marks-below {
+.scale.scale-has-marks-below .trough {
   margin: 10px 10px 14px; }
-  .fine-tune.scale.scale-has-marks-below {
-    margin: 8px 8px 12px; }
+.fine-tune.scale.scale-has-marks-below .trough {
+  margin: 8px 8px 12px; }
 
-.scale.vertical.scale-has-marks-above {
+.scale.vertical.scale-has-marks-above .trough {
   margin: 10px 10px 10px 14px; }
-  .fine-tune.scale.vertical.scale-has-marks-above {
-    margin: 8px 8px 8px 12px; }
+.fine-tune.scale.vertical.scale-has-marks-above .trough {
+  margin: 8px 8px 8px 12px; }
 
-.scale.vertical.scale-has-marks-below {
+.scale.vertical.scale-has-marks-below .trough {
   margin: 10px 14px 10px 10px; }
-  .fine-tune.scale.vertical.scale-has-marks-below {
-    margin: 8px 12px 8px 8px; }
+.fine-tune.scale.vertical.scale-has-marks-below .trough {
+  margin: 8px 12px 8px 8px; }
 
 /*****************
  * Progress bars *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index cd3b6e55a7..ed921816d3 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -3533,25 +3533,25 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.scale-has-marks-above {
+.scale.scale-has-marks-above .trough {
   margin: 14px 10px 10px; }
-  .fine-tune.scale.scale-has-marks-above {
-    margin: 12px 8px 8px; }
+.fine-tune.scale.scale-has-marks-above .trough {
+  margin: 12px 8px 8px; }
 
-.scale.scale-has-marks-below {
+.scale.scale-has-marks-below .trough {
   margin: 10px 10px 14px; }
-  .fine-tune.scale.scale-has-marks-below {
-    margin: 8px 8px 12px; }
+.fine-tune.scale.scale-has-marks-below .trough {
+  margin: 8px 8px 12px; }
 
-.scale.vertical.scale-has-marks-above {
+.scale.vertical.scale-has-marks-above .trough {
   margin: 10px 10px 10px 14px; }
-  .fine-tune.scale.vertical.scale-has-marks-above {
-    margin: 8px 8px 8px 12px; }
+.fine-tune.scale.vertical.scale-has-marks-above .trough {
+  margin: 8px 8px 8px 12px; }
 
-.scale.vertical.scale-has-marks-below {
+.scale.vertical.scale-has-marks-below .trough {
   margin: 10px 14px 10px 10px; }
-  .fine-tune.scale.vertical.scale-has-marks-below {
-    margin: 8px 12px 8px 8px; }
+.fine-tune.scale.vertical.scale-has-marks-below .trough {
+  margin: 8px 12px 8px 8px; }
 
 /*****************
  * Progress bars *
-- 
2.30.2